Merge branch 'icon-theme-api-rework' into 'master'

author Alexander Larsson <alexl@redhat.com>

Mon, 10 Feb 2020 12:45:56 +0000 (12:45 +0000)

committer Alexander Larsson <alexl@redhat.com>

Mon, 10 Feb 2020 12:45:56 +0000 (12:45 +0000)
author Alexander Larsson <alexl@redhat.com>
Mon, 10 Feb 2020 12:45:56 +0000 (12:45 +0000)
committer Alexander Larsson <alexl@redhat.com>
Mon, 10 Feb 2020 12:45:56 +0000 (12:45 +0000)
diff --cc docs/reference/gtk/gtk4-sections.txt
Simple merge
diff --cc gtk/gtktextlayout.c
Simple merge
diff --cc gtk/gtkwindow.c
Simple merge
diff --cc gtk/tools/gdkpixbufutils.c
Simple merge
author	Alexander Larsson <alexl@redhat.com>
	Mon, 10 Feb 2020 12:45:56 +0000 (12:45 +0000)
committer	Alexander Larsson <alexl@redhat.com>
	Mon, 10 Feb 2020 12:45:56 +0000 (12:45 +0000)
		1	2
docs/reference/gtk/gtk4-sections.txt	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtktextlayout.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtkwindow.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/tools/gdkpixbufutils.c	patch \|	diff1 \|	diff2 \|	blob \| history